Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[17.0][MIG] website_odoo_debranding Migration to 17.0 #1017

Merged
merged 27 commits into from
Mar 25, 2024

Conversation

NICO-SOLUTIONS
Copy link
Member

Standard migration to 17.0

@NICO-SOLUTIONS NICO-SOLUTIONS marked this pull request as ready for review November 12, 2023 22:24
@NICO-SOLUTIONS NICO-SOLUTIONS mentioned this pull request Nov 12, 2023
13 tasks
@pedrobaeza
Copy link
Member

/ocabot migration website_odoo_debranding

@OCA-git-bot OCA-git-bot added this to the 17.0 milestone Nov 12, 2023
@NICO-SOLUTIONS NICO-SOLUTIONS force-pushed the 17.0-mig-website_odoo_debranding branch from 737e1ab to 61179fb Compare January 2, 2024 18:46
@NICO-SOLUTIONS NICO-SOLUTIONS force-pushed the 17.0-mig-website_odoo_debranding branch from 61179fb to 8ed802a Compare January 3, 2024 10:36
Copy link
Member

@astirpe astirpe left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tested in runboat and code review ok

Copy link

@AaronHForgeFlow AaronHForgeFlow left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Functional

@OCA-git-bot
Copy link
Contributor

This PR has the approved label and has been created more than 5 days ago. It should therefore be ready to merge by a maintainer (or a PSC member if the concerned addon has no declared maintainer). 🤖

Copy link
Member

@astirpe astirpe left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There's an error when installing this module and afterwards installing enterprise module planning:

Element '<xpath expr="//t[@t-call=&#39;web.brand_promotion_message&#39;]">' cannot be located in parent view

@NICO-SOLUTIONS
Copy link
Member Author

There's an error when installing this module and afterwards installing enterprise module planning:

Element '<xpath expr="//t[@t-call=&#39;web.brand_promotion_message&#39;]">' cannot be located in parent view

good catch!
when installing planning, web.brand_promotion will be replaced by planning.brand_promotion. I´ll check xpathing another element...

@NICO-SOLUTIONS
Copy link
Member Author

NICO-SOLUTIONS commented Jan 30, 2024

@astirpe
i think in this case switching back to inherit the web module is the better approach.
As we need to keep...
t t-call="web.brand_promotion_message"
in order to get it working with planning...

inheriting the web.brand_promotion_message and xpathing the fields seems to be the better choice.
As this would loose the character of a website module... What do you think?

@astirpe
Copy link
Member

astirpe commented Jan 30, 2024

@NICO-SOLUTIONS

inheriting the web.brand_promotion_message and xpathing the fields seems to be the better choice. As this would loose the character of a website module... What do you think?

Yes, you are right: inheriting the web.brand_promotion_message would solve the conflicts.
I made a quick try locally with this xpath:

        <xpath expr="//t[@t-out]" position="replace">
            <t t-out=""/>
        </xpath>

but there are still some dirty characters left. So it seems not enough.

Copy link
Member

@astirpe astirpe left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tested and works fine. Just don't know if the t-set needs to be replaced or not but it doesn't matter for the result.

website_odoo_debranding/templates/disable_odoo.xml Outdated Show resolved Hide resolved
@NICO-SOLUTIONS
Copy link
Member Author

Tested and works fine. Just don't know if the t-set needs to be replaced or not but it doesn't matter for the result.

I added this because I had some leftovers when this is not set. But I'll cross check later on

cubells and others added 3 commits March 23, 2024 15:00
* Imported last updates from v8
* Adapted to v9
* Renamed to website_odoo_debranding
* Updated README
- Relicensed to LGPL.
- The template that does the job can be disabled by the admin.
Tardo and others added 19 commits March 23, 2024 15:00
[UPD] README.rst

Update translation files

Updated by "Update PO files to match POT (msgmerge)" hook in Weblate.

Translation: website-16.0/website-16.0-website_odoo_debranding
Translate-URL: https://translation.odoo-community.org/projects/website-16-0/website-16-0-website_odoo_debranding/

[UPD] README.rst
With website_odoo_debranding installed it was not possible to install enterprise planning. Planning relies on <t t-call="web.brand_promotion_message"> sections which was removed with replacing the o_brand_promotion.
@NICO-SOLUTIONS NICO-SOLUTIONS force-pushed the 17.0-mig-website_odoo_debranding branch from 1161c0d to 8292862 Compare March 23, 2024 14:01
@sanderlienaerts
Copy link

Status for getting this one merged?

@pedrobaeza
Copy link
Member

@sanderlienaerts you can collaborate reviewing the PR: https://odoo-community.org/page/review

But in this case, the existing reviewers are reputed ones,so merging:

/ocabot merge nobump

@OCA-git-bot
Copy link
Contributor

On my way to merge this fine PR!
Prepared branch 17.0-ocabot-merge-pr-1017-by-pedrobaeza-bump-nobump, awaiting test results.

@OCA-git-bot OCA-git-bot merged commit 3ed248f into OCA:17.0 Mar 25, 2024
5 of 7 checks passed
@OCA-git-bot
Copy link
Contributor

Congratulations, your PR was merged at a698130. Thanks a lot for contributing to OCA. ❤️

@NICO-SOLUTIONS
Copy link
Member Author

thanks! @pedrobaeza

@NICO-SOLUTIONS NICO-SOLUTIONS deleted the 17.0-mig-website_odoo_debranding branch March 25, 2024 08:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.